merge trunk
authorK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 12:42:37 +0000 (21:42 +0900)
committerK. Handa <handa@gnu.org>
Sun, 19 Jan 2014 12:42:37 +0000 (21:42 +0900)

Trivial merge